bitkeeper revision 1.1389.15.19 (42828a54qRrbnAaV5PFjo8DC3XonFA)

Merge

diff --cc linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
index 72b9206b75b51b58db5ef409d2d43457d2b204c0,ef7572baf6131b7be89efa244b5adf0088a09afb..9b4ce0892a94c24ef3e85377bbeb7789eaf844d0
--- 1/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
--- 2/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
@@@ -1567,16 -1566,19 +1567,23 @@@ void __init setup_arch(char **cmdline_p
        if (efi_enabled)
                efi_map_memmap();
  
-       /*
-        * Parse the ACPI tables for possible boot-time SMP configuration.
-        */
-       acpi_boot_table_init();
-       acpi_boot_init();
 +      op.cmd             = PHYSDEVOP_SET_IOPL;
 +      op.u.set_iopl.iopl = current->thread.io_pl = 1;
 +      HYPERVISOR_physdev_op(&op);
 +
+       if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
+       {
+            printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
+            acpi_disabled = 1;
+              acpi_ht = 0;
+       }
  
+       /*
+        * Parse the ACPI tables for possible boot-time SMP configuration.
+        */          
+         acpi_boot_table_init();
+         acpi_boot_init();
+            
  #ifdef CONFIG_X86_LOCAL_APIC
        if (smp_found_config)
                get_smp_config();